more use of qPrintable instead of CSTR or CSTRc with warning.

diff --git a/gpsbabel/arcdist.cc b/gpsbabel/arcdist.cc
index 6a59b8250d08eeea24bccb969d0433fc93c47e30..d3916c66b3c18472c7eaf1213a1e477904bc3576 100644 (file)
--- a/gpsbabel/arcdist.cc
+++ b/gpsbabel/arcdist.cc
@@ -253,7 +253,7 @@ arcdist_process(void)
         }
         if (global_opts.debug_level >= 1) {
           warning("Including waypoint %s at dist:%f lat:%f lon:%f\n",
-                  CSTRc(wp->shortname), ed->distance, wp->latitude, wp->longitude);
+                  qPrintable(wp->shortname), ed->distance, wp->latitude, wp->longitude);
         }
       }
       xfree(ed);

diff --git a/gpsbabel/delbin.cc b/gpsbabel/delbin.cc
index 75628c7e736d56cc2fe141ce452038d6e3a3084e..64d301d58cd73dc776695e4435ef653857d964d8 100644 (file)
--- a/gpsbabel/delbin.cc
+++ b/gpsbabel/delbin.cc
@@ -1982,7 +1982,7 @@ read_route(route_head* route)
   wp_array = (Waypoint**) xcalloc(total, sizeof(*wp_array));
   if (global_opts.debug_level >= DBGLVL_L) {
     warning(MYNAME ": route '%s' %u points, %u shape points\n",
-            CSTRc(route->rte_name), route_total, shape_total);
+            qPrintable(route->rte_name), route_total, shape_total);
   }
   message_free(&msg_array[0]);
   for (i = 1; i < msg_array_n; i++) {

diff --git a/gpsbabel/exif.cc b/gpsbabel/exif.cc
index 19a7110b97239691c2e96f59d74d1d5dbeb36d06..26795b4cadc35af5edaa902313d6d293daceec87 100644 (file)
--- a/gpsbabel/exif.cc
+++ b/gpsbabel/exif.cc
@@ -1455,7 +1455,7 @@ exif_write(void)
       if (exif_wpt_ref != NULL) {
         QString str = exif_time_str(exif_wpt_ref->creation_time.toTime_t());
         warning(MYNAME ": Best is from %s, %d second(s) away.\n",
-                CSTR(str), abs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t()));
+                qPrintable(str), abs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t()));
       }
       exif_wpt_ref = NULL;
     }

diff --git a/gpsbabel/gdb.cc b/gpsbabel/gdb.cc
index f2b0658257cd727f9ad3e6410233ceadbf44f77d..c301a890045eed607fdd13fc69105b1e8993135c 100644 (file)
--- a/gpsbabel/gdb.cc
+++ b/gpsbabel/gdb.cc
@@ -389,7 +389,7 @@ gdb_add_route_waypt(route_head* rte, Waypoint* ref, const int wpt_class)
     if (fabs(dist) > 100) {
       warning(MYNAME ": Route point mismatch!\n");
       warning(MYNAME ": \"%s\" from waypoints differs to \"%s\"\n",
-              CSTRc(tmp->shortname), CSTRc(ref->shortname));
+              qPrintable(tmp->shortname), qPrintable(ref->shortname));
       fatal(MYNAME ": from route table by more than %0.1f meters!\n",
             dist);